#!/bin/bash

diff3 -m --strip-trailing-cr pso/T27LC/chemical/shared/src/java/com/webex/webapp/psochemical/common/util/CheCommonTagsUtil.java base/T27L10NSP25/waf/src/java/com/webex/webapp/common/util/CommonTagsUtil.java base/T28L10NSP8/waf/src/java/com/webex/webapp/common/util/CommonTagsUtil.java > pso/T28L/chemical/shared/src/java/com/webex/webapp/psochemical/common/util/CheCommonTagsUtil.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/shared/src/java/com/webex/webapp/psochemical/common/biz/CheMeetingMailUtil.java base/T27L10NSP25/waf/src/java/com/webex/webapp/common/biz/MeetingMailUtil.java base/T28L10NSP8/waf/src/java/com/webex/webapp/common/biz/MeetingMailUtil.java > pso/T28L/chemical/shared/src/java/com/webex/webapp/psochemical/common/biz/CheMeetingMailUtil.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/shared/src/java/com/webex/webapp/psochemical/eventcenter/vo/calendar/CheECCalendarSearchCriteria.java base/T27L10NSP25/waf/src/java/com/webex/webapp/eventcenter/vo/calendar/ECCalendarSearchCriteria.java base/T28L10NSP8/waf/src/java/com/webex/webapp/eventcenter/vo/calendar/ECCalendarSearchCriteria.java > pso/T28L/chemical/shared/src/java/com/webex/webapp/psochemical/eventcenter/vo/calendar/CheECCalendarSearchCriteria.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/shared/src/java/com/webex/webapp/psochemical/eventcenter/vo/calendar/CheECCalendar.java base/T27L10NSP25/waf/src/java/com/webex/webapp/eventcenter/vo/calendar/ECCalendar.java base/T28L10NSP8/waf/src/java/com/webex/webapp/eventcenter/vo/calendar/ECCalendar.java > pso/T28L/chemical/shared/src/java/com/webex/webapp/psochemical/eventcenter/vo/calendar/CheECCalendar.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/shared/src/java/com/webex/webapp/psochemical/component/widget/icalendar/mc/CheMCMCICalendar.java base/T27L10NSP25/waf/src/java/com/webex/webapp/component/widget/icalendar/mc/MCMCICalendar.java base/T28L10NSP8/waf/src/java/com/webex/webapp/component/widget/icalendar/mc/MCMCICalendar.java > pso/T28L/chemical/shared/src/java/com/webex/webapp/psochemical/component/widget/icalendar/mc/CheMCMCICalendar.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/shared/src/java/com/webex/webapp/psochemical/component/widget/icalendar/mc/CheAbstractMCICalendarMgr.java base/T27L10NSP25/waf/src/java/com/webex/webapp/component/widget/icalendar/mc/AbstractMCICalendarMgr.java base/T28L10NSP8/waf/src/java/com/webex/webapp/component/widget/icalendar/mc/AbstractMCICalendarMgr.java > pso/T28L/chemical/shared/src/java/com/webex/webapp/psochemical/component/widget/icalendar/mc/CheAbstractMCICalendarMgr.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/shared/src/java/com/webex/webapp/psochemical/component/widget/icalendar/mc/CheMCCMCICalendar.java base/T27L10NSP25/waf/src/java/com/webex/webapp/component/widget/icalendar/mc/MCCMCICalendar.java base/T28L10NSP8/waf/src/java/com/webex/webapp/component/widget/icalendar/mc/MCCMCICalendar.java > pso/T28L/chemical/shared/src/java/com/webex/webapp/psochemical/component/widget/icalendar/mc/CheMCCMCICalendar.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/shared/src/java/com/webex/webapp/psochemical/component/docshow/CheDocShowAction.java base/T27L10NSP25/waf/src/java/com/webex/webapp/component/docshow/DocShowAction.java base/T28L10NSP8/waf/src/java/com/webex/webapp/component/docshow/DocShowAction.java > pso/T28L/chemical/shared/src/java/com/webex/webapp/psochemical/component/docshow/CheDocShowAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/shared/src/java/com/webex/webapp/psochemical/component/docshow/CheAbstractDocString.java base/T27L10NSP25/waf/src/java/com/webex/webapp/component/docshow/AbstractDocString.java base/T28L10NSP8/waf/src/java/com/webex/webapp/component/docshow/AbstractDocString.java > pso/T28L/chemical/shared/src/java/com/webex/webapp/psochemical/component/docshow/CheAbstractDocString.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/shared/src/java/com/webex/webapp/psochemical/component/biz/service/tc/CheTCAppMeetingBO.java base/T27L10NSP25/waf/src/java/com/webex/webapp/component/biz/service/tc/TCAppMeetingBO.java base/T28L10NSP8/waf/src/java/com/webex/webapp/component/biz/service/tc/TCAppMeetingBO.java > pso/T28L/chemical/shared/src/java/com/webex/webapp/psochemical/component/biz/service/tc/CheTCAppMeetingBO.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/shared/src/java/com/webex/webapp/psochemical/component/biz/service/ec/CheECAppMeetingBO.java base/T27L10NSP25/waf/src/java/com/webex/webapp/component/biz/service/ec/ECAppMeetingBO.java base/T28L10NSP8/waf/src/java/com/webex/webapp/component/biz/service/ec/ECAppMeetingBO.java > pso/T28L/chemical/shared/src/java/com/webex/webapp/psochemical/component/biz/service/ec/CheECAppMeetingBO.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/shared/src/java/com/webex/webapp/psochemical/component/scheduler/CheAbstractMeeting.java base/T27L10NSP25/waf/src/java/com/webex/webapp/component/scheduler/AbstractMeeting.java base/T28L10NSP8/waf/src/java/com/webex/webapp/component/scheduler/AbstractMeeting.java > pso/T28L/chemical/shared/src/java/com/webex/webapp/psochemical/component/scheduler/CheAbstractMeeting.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/shared/src/java/com/webex/webapp/psochemical/component/scheduler/CheSchedulerManager.java base/T27L10NSP25/waf/src/java/com/webex/webapp/component/scheduler/SchedulerManager.java base/T28L10NSP8/waf/src/java/com/webex/webapp/component/scheduler/SchedulerManager.java > pso/T28L/chemical/shared/src/java/com/webex/webapp/psochemical/component/scheduler/CheSchedulerManager.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/shared/src/java/com/webex/webapp/psochemical/component/scheduler/service/mc/CheMCMeeting.java base/T27L10NSP25/waf/src/java/com/webex/webapp/component/scheduler/service/mc/MCMeeting.java base/T28L10NSP8/waf/src/java/com/webex/webapp/component/scheduler/service/mc/MCMeeting.java > pso/T28L/chemical/shared/src/java/com/webex/webapp/psochemical/component/scheduler/service/mc/CheMCMeeting.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/shared/src/java/com/webex/webapp/psochemical/component/scheduler/CheMeeting.java base/T27L10NSP25/waf/src/java/com/webex/webapp/component/scheduler/Meeting.java base/T28L10NSP8/waf/src/java/com/webex/webapp/component/scheduler/Meeting.java > pso/T28L/chemical/shared/src/java/com/webex/webapp/psochemical/component/scheduler/CheMeeting.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/shared/src/java/com/webex/webapp/psochemical/component/calendar/common/util/CheCalendarUtil.java base/T27L10NSP25/waf/src/java/com/webex/webapp/component/calendar/common/util/CalendarUtil.java base/T28L10NSP8/waf/src/java/com/webex/webapp/component/calendar/common/util/CalendarUtil.java > pso/T28L/chemical/shared/src/java/com/webex/webapp/psochemical/component/calendar/common/util/CheCalendarUtil.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/shared/src/java/com/webex/webapp/psochemical/component/calendar/tab/CheAbstractCalendarTab.java base/T27L10NSP25/waf/src/java/com/webex/webapp/component/calendar/tab/AbstractCalendarTab.java base/T28L10NSP8/waf/src/java/com/webex/webapp/component/calendar/tab/AbstractCalendarTab.java > pso/T28L/chemical/shared/src/java/com/webex/webapp/psochemical/component/calendar/tab/CheAbstractCalendarTab.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/meetingcenter/src/java/com/webex/webapp/meetingcenter/psochemical/action/common/CheQuickStartInviteAction.java base/T27L10NSP25/meetingcenter/src/java/com/webex/webapp/meetingcenter/action/common/QuickStartInviteAction.java base/T28L10NSP8/meetingcenter/src/java/com/webex/webapp/meetingcenter/action/common/QuickStartInviteAction.java > pso/T28L/chemical/meetingcenter/src/java/com/webex/webapp/meetingcenter/psochemical/action/common/CheQuickStartInviteAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/meetingcenter/src/java/com/webex/webapp/meetingcenter/psochemical/action/mtgregister/CheRegistmeetingAction.java base/T27L10NSP25/meetingcenter/src/java/com/webex/webapp/meetingcenter/action/mtgregister/RegistmeetingAction.java base/T28L10NSP8/meetingcenter/src/java/com/webex/webapp/meetingcenter/action/mtgregister/RegistmeetingAction.java > pso/T28L/chemical/meetingcenter/src/java/com/webex/webapp/meetingcenter/psochemical/action/mtgregister/CheRegistmeetingAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/meetingcenter/src/java/com/webex/webapp/meetingcenter/psochemical/action/docshow/CheJoinSessionAction.java base/T27L10NSP25/meetingcenter/src/java/com/webex/webapp/meetingcenter/action/docshow/JoinSessionAction.java base/T28L10NSP8/meetingcenter/src/java/com/webex/webapp/meetingcenter/action/docshow/JoinSessionAction.java > pso/T28L/chemical/meetingcenter/src/java/com/webex/webapp/meetingcenter/psochemical/action/docshow/CheJoinSessionAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/meetingcenter/src/java/com/webex/webapp/meetingcenter/psochemical/action/api/CheInviteEmailAction.java base/T27L10NSP25/meetingcenter/src/java/com/webex/webapp/meetingcenter/action/api/InviteEmailAction.java base/T28L10NSP8/meetingcenter/src/java/com/webex/webapp/meetingcenter/action/api/InviteEmailAction.java > pso/T28L/chemical/meetingcenter/src/java/com/webex/webapp/meetingcenter/psochemical/action/api/CheInviteEmailAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/meetingcenter/src/java/com/webex/webapp/meetingcenter/psochemical/action/attendeeinfo/CheAttendeeInfoAction.java base/T27L10NSP25/meetingcenter/src/java/com/webex/webapp/meetingcenter/action/attendeeinfo/AttendeeInfoAction.java base/T28L10NSP8/meetingcenter/src/java/com/webex/webapp/meetingcenter/action/attendeeinfo/AttendeeInfoAction.java > pso/T28L/chemical/meetingcenter/src/java/com/webex/webapp/meetingcenter/psochemical/action/attendeeinfo/CheAttendeeInfoAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/meetingcenter/src/java/com/webex/webapp/meetingcenter/psochemical/biz/common/CheSendmailMgrImpl.java base/T27L10NSP25/meetingcenter/src/java/com/webex/webapp/meetingcenter/biz/common/SendmailMgrImpl.java base/T28L10NSP8/meetingcenter/src/java/com/webex/webapp/meetingcenter/biz/common/SendmailMgrImpl.java > pso/T28L/chemical/meetingcenter/src/java/com/webex/webapp/meetingcenter/psochemical/biz/common/CheSendmailMgrImpl.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/meetingcenter/src/java/com/webex/webapp/meetingcenter/psochemical/biz/attendeeinfo/CheAttendeeInfoManager.java base/T27L10NSP25/meetingcenter/src/java/com/webex/webapp/meetingcenter/biz/attendeeinfo/AttendeeInfoManager.java base/T28L10NSP8/meetingcenter/src/java/com/webex/webapp/meetingcenter/biz/attendeeinfo/AttendeeInfoManager.java > pso/T28L/chemical/meetingcenter/src/java/com/webex/webapp/meetingcenter/psochemical/biz/attendeeinfo/CheAttendeeInfoManager.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/meetingcenter/src/java/com/webex/webapp/meetingcenter/psochemical/biz/meeting/CheMCMeetingMgr.java base/T27L10NSP25/meetingcenter/src/java/com/webex/webapp/meetingcenter/biz/meeting/MCMeetingMgr.java base/T28L10NSP8/meetingcenter/src/java/com/webex/webapp/meetingcenter/biz/meeting/MCMeetingMgr.java > pso/T28L/chemical/meetingcenter/src/java/com/webex/webapp/meetingcenter/psochemical/biz/meeting/CheMCMeetingMgr.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/meetingcenter/src/conf/psochemical/struts-config.xml base/T27L10NSP25/meetingcenter/web/WEB-INF/struts-config.xml base/T28L10NSP8/meetingcenter/web/WEB-INF/struts-config.xml > pso/T28L/chemical/meetingcenter/src/conf/psochemical/struts-config.xml
diff3 -m --strip-trailing-cr pso/T27LC/chemical/meetingcenter/web/meetingcenter/jsp/pso/psochemical/meetinginfo/che_meetinginfo.jsp base/T27L10NSP25/meetingcenter/web/meetingcenter/jsp/meetinginfo/meetinginfo.jsp base/T28L10NSP8/meetingcenter/web/meetingcenter/jsp/meetinginfo/meetinginfo.jsp > pso/T28L/chemical/meetingcenter/web/meetingcenter/jsp/pso/psochemical/meetinginfo/che_meetinginfo.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/meetingcenter/web/meetingcenter/jsp/pso/psochemical/attendeeinfo/che_sendExcel.jsp base/T27L10NSP25/meetingcenter/web/meetingcenter/jsp/attendeeinfo/sendExcel.jsp base/T28L10NSP8/meetingcenter/web/meetingcenter/jsp/attendeeinfo/sendExcel.jsp > pso/T28L/chemical/meetingcenter/web/meetingcenter/jsp/pso/psochemical/attendeeinfo/che_sendExcel.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/siteadmin/src/conf/psochemical/struts-config.xml base/T27L10NSP25/siteadmin/web/WEB-INF/struts-config.xml base/T28L10NSP8/siteadmin/web/WEB-INF/struts-config.xml > pso/T28L/chemical/siteadmin/src/conf/psochemical/struts-config.xml
diff3 -m --strip-trailing-cr pso/T27LC/chemical/siteadmin/src/resources/psochemical/CheSiteadminResources.properties base/T27L10NSP25/siteadmin/src/resources/SiteadminResources.properties base/T28L10NSP8/siteadmin/src/resources/SiteadminResources.properties > pso/T28L/chemical/siteadmin/src/resources/psochemical/CheSiteadminResources.properties
diff3 -m --strip-trailing-cr pso/T27LC/chemical/siteadmin/web/siteadmin/jsp/pso/psochemical/frame/che_menu.jsp base/T27L10NSP25/siteadmin/web/siteadmin/jsp/frame/menu.jsp base/T28L10NSP8/siteadmin/web/siteadmin/jsp/frame/menu.jsp > pso/T28L/chemical/siteadmin/web/siteadmin/jsp/pso/psochemical/frame/che_menu.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/site/CheOutlookAction.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/site/OutlookAction.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/site/OutlookAction.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/site/CheOutlookAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/testing/CheTestingUtil.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/testing/TestingUtil.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/testing/TestingUtil.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/testing/CheTestingUtil.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/vo/docshow/CheTCMeetingDocBeanCreator.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/vo/docshow/TCMeetingDocBeanCreator.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/vo/docshow/TCMeetingDocBeanCreator.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/vo/docshow/CheTCMeetingDocBeanCreator.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/util/CheTCCaledarUtil.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/util/TCCaledarUtil.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/util/TCCaledarUtil.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/util/CheTCCaledarUtil.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/biz/record/CheNewRecordManagerImpl.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/biz/record/NewRecordManagerImpl.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/biz/record/NewRecordManagerImpl.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/biz/record/CheNewRecordManagerImpl.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/biz/record/CheRecordBO.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/biz/record/RecordBO.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/biz/record/RecordBO.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/biz/record/CheRecordBO.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/biz/meeting/CheTCMeetingMgr.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/biz/meeting/TCMeetingMgr.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/biz/meeting/TCMeetingMgr.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/biz/meeting/CheTCMeetingMgr.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/sendmail/util/CheSessionVariableGeneratorUtil.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/sendmail/util/SessionVariableGeneratorUtil.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/sendmail/util/SessionVariableGeneratorUtil.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/sendmail/util/CheSessionVariableGeneratorUtil.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/sendmail/tbobuilder/CheRegisterSessionInviteForAttendeeMailTBOBuilder.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/sendmail/tbobuilder/RegisterSessionInviteForAttendeeMailTBOBuilder.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/sendmail/tbobuilder/RegisterSessionInviteForAttendeeMailTBOBuilder.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/sendmail/tbobuilder/CheRegisterSessionInviteForAttendeeMailTBOBuilder.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/sendmail/tbobuilder/CheSessionUpdateToJoinMailTBOBuilder.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/sendmail/tbobuilder/SessionUpdateToJoinMailTBOBuilder.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/sendmail/tbobuilder/SessionUpdateToJoinMailTBOBuilder.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/sendmail/tbobuilder/CheSessionUpdateToJoinMailTBOBuilder.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/sendmail/tbobuilder/CheSessionInviteForAttendeeMailTBOBuilder.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/sendmail/tbobuilder/SessionInviteForAttendeeMailTBOBuilder.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/sendmail/tbobuilder/SessionInviteForAttendeeMailTBOBuilder.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/sendmail/tbobuilder/CheSessionInviteForAttendeeMailTBOBuilder.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/sendmail/tbobuilder/CheSessionRescheduleForAttendeeMailTBOBuilder.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/sendmail/tbobuilder/SessionRescheduleForAttendeeMailTBOBuilder.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/sendmail/tbobuilder/SessionRescheduleForAttendeeMailTBOBuilder.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/sendmail/tbobuilder/CheSessionRescheduleForAttendeeMailTBOBuilder.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/sendmail/tbobuilder/CheSessionUpdateToRegisterMailTBOBuilder.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/sendmail/tbobuilder/SessionUpdateToRegisterMailTBOBuilder.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/sendmail/tbobuilder/SessionUpdateToRegisterMailTBOBuilder.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/sendmail/tbobuilder/CheSessionUpdateToRegisterMailTBOBuilder.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/sendmail/templatevariables/CheSessionUpdateToRegisterVG.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/sendmail/templatevariables/SessionUpdateToRegisterVG.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/sendmail/templatevariables/SessionUpdateToRegisterVG.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/sendmail/templatevariables/CheSessionUpdateToRegisterVG.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/sendmail/templatevariables/CheSessionInviteForAttendeeVG.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/sendmail/templatevariables/SessionInviteForAttendeeVG.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/sendmail/templatevariables/SessionInviteForAttendeeVG.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/sendmail/templatevariables/CheSessionInviteForAttendeeVG.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/sendmail/templatevariables/CheSessionUpdateToJoinVG.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/sendmail/templatevariables/SessionUpdateToJoinVG.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/sendmail/templatevariables/SessionUpdateToJoinVG.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/sendmail/templatevariables/CheSessionUpdateToJoinVG.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/sendmail/templatevariables/CheRegisterSessionInviteForAttendeeVG.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/sendmail/templatevariables/RegisterSessionInviteForAttendeeVG.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/sendmail/templatevariables/RegisterSessionInviteForAttendeeVG.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/sendmail/templatevariables/CheRegisterSessionInviteForAttendeeVG.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/sendmail/templatevariables/CheSessionRescheduleForAttendeeVG.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/sendmail/templatevariables/SessionRescheduleForAttendeeVG.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/sendmail/templatevariables/SessionRescheduleForAttendeeVG.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/sendmail/templatevariables/CheSessionRescheduleForAttendeeVG.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/CheTCMailUtil.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/TCMailUtil.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/TCMailUtil.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/CheTCMailUtil.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/CheTCMeetingMailUtil.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/TCMeetingMailUtil.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/TCMeetingMailUtil.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/CheTCMeetingMailUtil.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/CheTCHOLMailUtil.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/TCHOLMailUtil.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/common/mail/TCHOLMailUtil.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/common/mail/CheTCHOLMailUtil.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/docshow/CheJmfWebAction.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/docshow/JmfWebAction.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/docshow/JmfWebAction.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/docshow/CheJmfWebAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/docshow/CheTCDocString1.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/docshow/TCDocString1.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/docshow/TCDocString1.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/docshow/CheTCDocString1.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/docshow/parameters/session/CheSessionParametersGenerator.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/docshow/parameters/session/SessionParametersGenerator.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/docshow/parameters/session/SessionParametersGenerator.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/docshow/parameters/session/CheSessionParametersGenerator.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/docshow/parameters/session/CheOthersParametersGenerator.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/docshow/parameters/session/OthersParametersGenerator.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/docshow/parameters/session/OthersParametersGenerator.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/docshow/parameters/session/CheOthersParametersGenerator.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/docshow/parameters/session/CheTeleConferenceParametersGenerator.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/docshow/parameters/session/TeleConferenceParametersGenerator.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/docshow/parameters/session/TeleConferenceParametersGenerator.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/docshow/parameters/session/CheTeleConferenceParametersGenerator.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/docshow/training/CheTCDocString.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/docshow/training/TCDocString.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/docshow/training/TCDocString.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/docshow/training/CheTCDocString.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/docshow/training/CheJoinSessionAction.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/docshow/training/JoinSessionAction.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/docshow/training/JoinSessionAction.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/docshow/training/CheJoinSessionAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/register/CheRegisterSessionActAction.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/register/RegisterSessionActAction.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/register/RegisterSessionActAction.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/register/CheRegisterSessionActAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/register/CheRegisterFullAction.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/register/RegisterFullAction.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/register/RegisterFullAction.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/register/CheRegisterFullAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/register/CheCancelRegisterSessionAction.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/register/CancelRegisterSessionAction.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/register/CancelRegisterSessionAction.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/register/CheCancelRegisterSessionAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/register/frommail/CheTCRegisterSubmitAction.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/register/frommail/TCRegisterSubmitAction.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/register/frommail/TCRegisterSubmitAction.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/register/frommail/CheTCRegisterSubmitAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/register/CheRegisterWaitListAction.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/register/RegisterWaitListAction.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/register/RegisterWaitListAction.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/register/CheRegisterWaitListAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/register/CheRegisterHelper.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/register/RegisterHelper.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/register/RegisterHelper.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/register/CheRegisterHelper.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/register/CheRegisterActHelper.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/register/RegisterActHelper.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/register/RegisterActHelper.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/register/CheRegisterActHelper.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/record/CheMyWbxRecordAction.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/record/MyWbxRecordAction.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/record/MyWbxRecordAction.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/record/CheMyWbxRecordAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/record/CheDownloadViewAction.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/record/DownloadViewAction.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/record/DownloadViewAction.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/record/CheDownloadViewAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/record/CheRecordAction.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/record/RecordAction.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/record/RecordAction.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/record/CheRecordAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/scheduler/deal/CheAbstractScheduleDeal.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/scheduler/deal/AbstractScheduleDeal.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/scheduler/deal/AbstractScheduleDeal.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/scheduler/deal/CheAbstractScheduleDeal.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/scheduler/CheDeleteMeetingAction.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/scheduler/DeleteMeetingAction.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/scheduler/DeleteMeetingAction.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/scheduler/CheDeleteMeetingAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/scheduler/CheSchedulerBO.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/scheduler/SchedulerBO.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/scheduler/SchedulerBO.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/scheduler/CheSchedulerBO.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/scheduler/CheSchedulerConfirmAction.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/scheduler/SchedulerConfirmAction.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/scheduler/SchedulerConfirmAction.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/scheduler/CheSchedulerConfirmAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/scheduler/ICalendar/CheTcIcalendarAction.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/scheduler/ICalendar/TcIcalendarAction.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/scheduler/ICalendar/TcIcalendarAction.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/scheduler/ICalendar/CheTcIcalendarAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/frame/CheDefaultAction.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/frame/DefaultAction.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/frame/DefaultAction.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/frame/CheDefaultAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/handsonlab/CheHandsOnLabAction.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/handsonlab/HandsOnLabAction.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/handsonlab/HandsOnLabAction.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/handsonlab/CheHandsOnLabAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/meeting/CheTCMeetingBO.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/meeting/TCMeetingBO.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/meeting/TCMeetingBO.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/meeting/CheTCMeetingBO.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/meeting/CheViewRegisteredAttendeeAction.java base/T27L10NSP25/trainingcenter/src/java/com/webex/webapp/trainingcenter/meeting/ViewRegisteredAttendeeAction.java base/T28L10NSP8/trainingcenter/src/java/com/webex/webapp/trainingcenter/meeting/ViewRegisteredAttendeeAction.java > pso/T28L/chemical/trainingcenter/src/java/com/webex/webapp/trainingcenter/psochemical/meeting/CheViewRegisteredAttendeeAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/register/che_registersession.jsp base/T27L10NSP25/trainingcenter/web/trainingcenter/jsp/register/registersession.jsp base/T28L10NSP8/trainingcenter/web/trainingcenter/jsp/register/registersession.jsp > pso/T28L/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/register/che_registersession.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/record/che_record.jsp base/T27L10NSP25/trainingcenter/web/trainingcenter/jsp/record/record.jsp base/T28L10NSP8/trainingcenter/web/trainingcenter/jsp/record/record.jsp > pso/T28L/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/record/che_record.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/record/section/che_section1.jsp base/T27L10NSP25/trainingcenter/web/trainingcenter/jsp/record/section/section1.jsp base/T28L10NSP8/trainingcenter/web/trainingcenter/jsp/record/section/section1.jsp > pso/T28L/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/record/section/che_section1.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/record/section/che_section3.jsp base/T27L10NSP25/trainingcenter/web/trainingcenter/jsp/record/section/section3.jsp base/T28L10NSP8/trainingcenter/web/trainingcenter/jsp/record/section/section3.jsp > pso/T28L/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/record/section/che_section3.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/record/section/che_section2.jsp base/T27L10NSP25/trainingcenter/web/trainingcenter/jsp/record/section/section2.jsp base/T28L10NSP8/trainingcenter/web/trainingcenter/jsp/record/section/section2.jsp > pso/T28L/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/record/section/che_section2.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/record/che_recordinfo.jsp base/T27L10NSP25/trainingcenter/web/trainingcenter/jsp/record/recordinfo.jsp base/T28L10NSP8/trainingcenter/web/trainingcenter/jsp/record/recordinfo.jsp > pso/T28L/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/record/che_recordinfo.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/scheduler/che_std_layout.jsp base/T27L10NSP25/trainingcenter/web/trainingcenter/jsp/scheduler/std_layout.jsp base/T28L10NSP8/trainingcenter/web/trainingcenter/jsp/scheduler/std_layout.jsp > pso/T28L/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/scheduler/che_std_layout.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/scheduler/che_confirmation.jsp base/T27L10NSP25/trainingcenter/web/trainingcenter/jsp/scheduler/confirmation.jsp base/T28L10NSP8/trainingcenter/web/trainingcenter/jsp/scheduler/confirmation.jsp > pso/T28L/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/scheduler/che_confirmation.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/scheduler/che_schedulerconfirmation.jsp base/T27L10NSP25/trainingcenter/web/trainingcenter/jsp/scheduler/schedulerconfirmation.jsp base/T28L10NSP8/trainingcenter/web/trainingcenter/jsp/scheduler/schedulerconfirmation.jsp > pso/T28L/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/scheduler/che_schedulerconfirmation.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/scheduler/sections/che_section1.jsp base/T27L10NSP25/trainingcenter/web/trainingcenter/jsp/scheduler/sections/section1.jsp base/T28L10NSP8/trainingcenter/web/trainingcenter/jsp/scheduler/sections/section1.jsp > pso/T28L/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/scheduler/sections/che_section1.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/scheduler/sections/che_section11.jsp base/T27L10NSP25/trainingcenter/web/trainingcenter/jsp/scheduler/sections/section11.jsp base/T28L10NSP8/trainingcenter/web/trainingcenter/jsp/scheduler/sections/section11.jsp > pso/T28L/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/scheduler/sections/che_section11.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/meeting/che_sessioninfo_layout.jsp base/T27L10NSP25/trainingcenter/web/trainingcenter/jsp/meeting/sessioninfo_layout.jsp base/T28L10NSP8/trainingcenter/web/trainingcenter/jsp/meeting/sessioninfo_layout.jsp > pso/T28L/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/meeting/che_sessioninfo_layout.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/meeting/che_sessioninfo.jsp base/T27L10NSP25/trainingcenter/web/trainingcenter/jsp/meeting/sessioninfo.jsp base/T28L10NSP8/trainingcenter/web/trainingcenter/jsp/meeting/sessioninfo.jsp > pso/T28L/chemical/trainingcenter/web/trainingcenter/jsp/pso/psochemical/meeting/che_sessioninfo.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/mywebex/src/java/com/webex/webapp/mywebex/psochemical/meeting/CheMyMeetingAction.java base/T27L10NSP25/mywebex/src/java/com/webex/webapp/mywebex/meeting/MyMeetingAction.java base/T28L10NSP8/mywebex/src/java/com/webex/webapp/mywebex/meeting/MyMeetingAction.java > pso/T28L/chemical/mywebex/src/java/com/webex/webapp/mywebex/psochemical/meeting/CheMyMeetingAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/mywebex/src/conf/psochemical/struts-config.xml base/T27L10NSP25/mywebex/web/WEB-INF/struts-config.xml base/T28L10NSP8/mywebex/web/WEB-INF/struts-config.xml > pso/T28L/chemical/mywebex/src/conf/psochemical/struts-config.xml
diff3 -m --strip-trailing-cr pso/T27LC/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_std_search_page_host_TP.jsp base/T27L10NSP25/mywebex/web/mywebex/jsp/meeting/std_search_page_host_TP.jsp base/T28L10NSP8/mywebex/web/mywebex/jsp/meeting/std_search_page_host_TP.jsp > pso/T28L/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_std_search_page_host_TP.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_std_layout.jsp base/T27L10NSP25/mywebex/web/mywebex/jsp/meeting/std_layout.jsp base/T28L10NSP8/mywebex/web/mywebex/jsp/meeting/std_layout.jsp > pso/T28L/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_std_layout.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_mymeeting.jsp base/T27L10NSP25/mywebex/web/mywebex/jsp/meeting/mymeeting.jsp base/T28L10NSP8/mywebex/web/mywebex/jsp/meeting/mymeeting.jsp > pso/T28L/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_mymeeting.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_std_tab.jsp base/T27L10NSP25/mywebex/web/mywebex/jsp/meeting/std_tab.jsp base/T28L10NSP8/mywebex/web/mywebex/jsp/meeting/std_tab.jsp > pso/T28L/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_std_tab.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_std_search_page_host.jsp base/T27L10NSP25/mywebex/web/mywebex/jsp/meeting/std_search_page_host.jsp base/T28L10NSP8/mywebex/web/mywebex/jsp/meeting/std_search_page_host.jsp > pso/T28L/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_std_search_page_host.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_std_search_page.jsp base/T27L10NSP25/mywebex/web/mywebex/jsp/meeting/std_search_page.jsp base/T28L10NSP8/mywebex/web/mywebex/jsp/meeting/std_search_page.jsp > pso/T28L/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_std_search_page.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_std_weekly_page.jsp base/T27L10NSP25/mywebex/web/mywebex/jsp/meeting/std_weekly_page.jsp base/T28L10NSP8/mywebex/web/mywebex/jsp/meeting/std_weekly_page.jsp > pso/T28L/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_std_weekly_page.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_std_weekly_page_host.jsp base/T27L10NSP25/mywebex/web/mywebex/jsp/meeting/std_weekly_page_host.jsp base/T28L10NSP8/mywebex/web/mywebex/jsp/meeting/std_weekly_page_host.jsp > pso/T28L/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_std_weekly_page_host.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_std_today_page.jsp base/T27L10NSP25/mywebex/web/mywebex/jsp/meeting/std_today_page.jsp base/T28L10NSP8/mywebex/web/mywebex/jsp/meeting/std_today_page.jsp > pso/T28L/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_std_today_page.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_std_weekly_page_host_TP.jsp base/T27L10NSP25/mywebex/web/mywebex/jsp/meeting/std_weekly_page_host_TP.jsp base/T28L10NSP8/mywebex/web/mywebex/jsp/meeting/std_weekly_page_host_TP.jsp > pso/T28L/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_std_weekly_page_host_TP.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_std_today_page_host_TP.jsp base/T27L10NSP25/mywebex/web/mywebex/jsp/meeting/std_today_page_host_TP.jsp base/T28L10NSP8/mywebex/web/mywebex/jsp/meeting/std_today_page_host_TP.jsp > pso/T28L/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_std_today_page_host_TP.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_std_today_page_host.jsp base/T27L10NSP25/mywebex/web/mywebex/jsp/meeting/std_today_page_host.jsp base/T28L10NSP8/mywebex/web/mywebex/jsp/meeting/std_today_page_host.jsp > pso/T28L/chemical/mywebex/web/mywebex/jsp/pso/psochemical/meeting/che_std_today_page_host.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/common/CheWbxEcAction.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/common/WbxEcAction.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/common/WbxEcAction.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/common/CheWbxEcAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/common/taglib/CheECTimeSelectorTag.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/common/taglib/ECTimeSelectorTag.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/common/taglib/ECTimeSelectorTag.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/common/taglib/CheECTimeSelectorTag.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/common/taglib/CheDateTimeShowTag.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/common/taglib/DateTimeShowTag.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/common/taglib/DateTimeShowTag.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/common/taglib/CheDateTimeShowTag.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/common/CheECDateAssistant.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/common/ECDateAssistant.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/common/ECDateAssistant.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/common/CheECDateAssistant.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/common/utils/CheECDateTimeFormatUtil.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/common/utils/ECDateTimeFormatUtil.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/common/utils/ECDateTimeFormatUtil.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/common/utils/CheECDateTimeFormatUtil.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/docshow/CheECDocShowValue.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/docshow/ECDocShowValue.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/docshow/ECDocShowValue.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/docshow/CheECDocShowValue.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/docshow/CheECDocString.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/docshow/ECDocString.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/docshow/ECDocString.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/docshow/CheECDocString.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/docshow/view/CheECDocShowEntranceAction.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/docshow/view/ECDocShowEntranceAction.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/docshow/view/ECDocShowEntranceAction.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/docshow/view/CheECDocShowEntranceAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/docshow/view/CheECDocShowJmfWebAction.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/docshow/view/ECDocShowJmfWebAction.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/docshow/view/ECDocShowJmfWebAction.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/docshow/view/CheECDocShowJmfWebAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/docshow/utils/CheECDocShowUtils.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/docshow/utils/ECDocShowUtils.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/docshow/utils/ECDocShowUtils.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/docshow/utils/CheECDocShowUtils.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/recording/CheECRecordAction.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/recording/ECRecordAction.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/recording/ECRecordAction.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/recording/CheECRecordAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/biz/calendar/CheECCalendarMgr.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/biz/calendar/ECCalendarMgr.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/biz/calendar/ECCalendarMgr.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/biz/calendar/CheECCalendarMgr.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/biz/calendar/util/CheEventStatus.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/biz/calendar/util/EventStatus.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/biz/calendar/util/EventStatus.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/biz/calendar/util/CheEventStatus.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/biz/calendar/CheECCalendarMgrImpl.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/biz/calendar/ECCalendarMgrImpl.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/biz/calendar/ECCalendarMgrImpl.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/biz/calendar/CheECCalendarMgrImpl.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/biz/enroll/CheECEnrollHelper.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/biz/enroll/ECEnrollHelper.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/biz/enroll/ECEnrollHelper.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/biz/enroll/CheECEnrollHelper.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/frame/CheExpandAction.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/frame/ExpandAction.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/frame/ExpandAction.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/frame/CheExpandAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/frame/CheECMainframeAction.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/frame/ECMainframeAction.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/frame/ECMainframeAction.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/frame/CheECMainframeAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/event/CheECCalendarUtils.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/event/ECCalendarUtils.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/event/ECCalendarUtils.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/event/CheECCalendarUtils.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/event/scheduler/taglib/CheECEventState.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/event/scheduler/taglib/ECEventState.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/event/scheduler/taglib/ECEventState.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/event/scheduler/taglib/CheECEventState.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/event/scheduler/CheSchedulerAction.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/event/scheduler/SchedulerAction.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/event/scheduler/SchedulerAction.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/event/scheduler/CheSchedulerAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/event/scheduler/CheECSchedulerMgrImpl.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/event/scheduler/ECSchedulerMgrImpl.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/event/scheduler/ECSchedulerMgrImpl.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/event/scheduler/CheECSchedulerMgrImpl.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/mail/CheECMailReplaceValues.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/mail/ECMailReplaceValues.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/mail/ECMailReplaceValues.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/mail/CheECMailReplaceValues.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/enroll/CheECInviteFriendsAction.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/enroll/ECInviteFriendsAction.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/enroll/ECInviteFriendsAction.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/enroll/CheECInviteFriendsAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/enroll/CheECEnrollmentrequestsAction.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/enroll/ECEnrollmentrequestsAction.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/enroll/ECEnrollmentrequestsAction.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/enroll/CheECEnrollmentrequestsAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/enroll/CheECRegisterAction.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/enroll/ECRegisterAction.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/enroll/ECRegisterAction.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/enroll/CheECRegisterAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/enroll/CheECSendEmailAction.java base/T27L10NSP25/eventcenter/src/java/com/webex/webapp/eventcenter/enroll/ECSendEmailAction.java base/T28L10NSP8/eventcenter/src/java/com/webex/webapp/eventcenter/enroll/ECSendEmailAction.java > pso/T28L/chemical/eventcenter/src/java/com/webex/webapp/eventcenter/psochemical/enroll/CheECSendEmailAction.java
#error: non-unique match:pso/T27LC/chemical/eventcenter/src/conf/psochemical/struts-config.xml
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/src/resources/psochemical/CheEventCenterResources.properties base/T27L10NSP25/eventcenter/src/resources/EventCenterResources.properties base/T28L10NSP8/eventcenter/src/resources/EventCenterResources.properties > pso/T28L/chemical/eventcenter/src/resources/psochemical/CheEventCenterResources.properties
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/report/che_report_partd_search.jsp base/T27L10NSP25/eventcenter/web/eventcenter/jsp/report/report_partd_search.jsp base/T28L10NSP8/eventcenter/web/eventcenter/jsp/report/report_partd_search.jsp > pso/T28L/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/report/che_report_partd_search.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/report/che_includedatebar.jsp base/T27L10NSP25/eventcenter/web/eventcenter/jsp/report/includedatebar.jsp base/T28L10NSP8/eventcenter/web/eventcenter/jsp/report/includedatebar.jsp > pso/T28L/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/report/che_includedatebar.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/join/che_eventinfo.jsp base/T27L10NSP25/eventcenter/web/eventcenter/jsp/join/eventinfo.jsp base/T28L10NSP8/eventcenter/web/eventcenter/jsp/join/eventinfo.jsp > pso/T28L/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/join/che_eventinfo.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/join/che_eventjoininfor.jsp base/T27L10NSP25/eventcenter/web/eventcenter/jsp/join/eventjoininfor.jsp base/T28L10NSP8/eventcenter/web/eventcenter/jsp/join/eventjoininfor.jsp > pso/T28L/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/join/che_eventjoininfor.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/recording/che_myrecord_edit.jsp base/T27L10NSP25/eventcenter/web/eventcenter/jsp/recording/myrecord_edit.jsp base/T28L10NSP8/eventcenter/web/eventcenter/jsp/recording/myrecord_edit.jsp > pso/T28L/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/recording/che_myrecord_edit.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/recording/che_myrecord_attendee_view.jsp base/T27L10NSP25/eventcenter/web/eventcenter/jsp/recording/myrecord_attendee_view.jsp base/T28L10NSP8/eventcenter/web/eventcenter/jsp/recording/myrecord_attendee_view.jsp > pso/T28L/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/recording/che_myrecord_attendee_view.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/recording/che_myrecord_view.jsp base/T27L10NSP25/eventcenter/web/eventcenter/jsp/recording/myrecord_view.jsp base/T28L10NSP8/eventcenter/web/eventcenter/jsp/recording/myrecord_view.jsp > pso/T28L/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/recording/che_myrecord_view.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/frame/che_ecleftframe.jsp base/T27L10NSP25/eventcenter/web/eventcenter/jsp/frame/ecleftframe.jsp base/T28L10NSP8/eventcenter/web/eventcenter/jsp/frame/ecleftframe.jsp > pso/T28L/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/frame/che_ecleftframe.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/event/che_event_information.jsp base/T27L10NSP25/eventcenter/web/eventcenter/jsp/event/event_information.jsp base/T28L10NSP8/eventcenter/web/eventcenter/jsp/event/event_information.jsp > pso/T28L/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/event/che_event_information.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/event/che_event_info.jsp base/T27L10NSP25/eventcenter/web/eventcenter/jsp/event/event_info.jsp base/T28L10NSP8/eventcenter/web/eventcenter/jsp/event/event_info.jsp > pso/T28L/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/event/che_event_info.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/event/che_event_searchresults.jsp base/T27L10NSP25/eventcenter/web/eventcenter/jsp/event/event_searchresults.jsp base/T28L10NSP8/eventcenter/web/eventcenter/jsp/event/event_searchresults.jsp > pso/T28L/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/event/che_event_searchresults.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/event/scheduler/che_scheduler.jsp base/T27L10NSP25/eventcenter/web/eventcenter/jsp/event/scheduler/scheduler.jsp base/T28L10NSP8/eventcenter/web/eventcenter/jsp/event/scheduler/scheduler.jsp > pso/T28L/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/event/scheduler/che_scheduler.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/enroll/che_success.jsp base/T27L10NSP25/eventcenter/web/eventcenter/jsp/enroll/success.jsp base/T28L10NSP8/eventcenter/web/eventcenter/jsp/enroll/success.jsp > pso/T28L/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/enroll/che_success.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/enroll/che_register.jsp base/T27L10NSP25/eventcenter/web/eventcenter/jsp/enroll/register.jsp base/T28L10NSP8/eventcenter/web/eventcenter/jsp/enroll/register.jsp > pso/T28L/chemical/eventcenter/web/eventcenter/jsp/pso/psochemical/enroll/che_register.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/eventcenter/web/WEB-INF/tld/psochemical/che_webex-ec.tld base/T27L10NSP25/eventcenter/web/WEB-INF/tld/webex-ec.tld base/T28L10NSP8/eventcenter/web/WEB-INF/tld/webex-ec.tld > pso/T28L/chemical/eventcenter/web/WEB-INF/tld/psochemical/che_webex-ec.tld
diff3 -m --strip-trailing-cr pso/T27LC/chemical/webcomponents/src/java/com/webex/webapp/component/psochemical/widget/icalendar/CheICalendarCreateAction.java base/T27L10NSP25/webcomponents/src/java/com/webex/webapp/component/widget/icalendar/ICalendarCreateAction.java base/T28L10NSP8/webcomponents/src/java/com/webex/webapp/component/widget/icalendar/ICalendarCreateAction.java > pso/T28L/chemical/webcomponents/src/java/com/webex/webapp/component/psochemical/widget/icalendar/CheICalendarCreateAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/webcomponents/src/java/com/webex/webapp/component/psochemical/scheduler/CheConfirmationAction.java base/T27L10NSP25/webcomponents/src/java/com/webex/webapp/component/scheduler/ConfirmationAction.java base/T28L10NSP8/webcomponents/src/java/com/webex/webapp/component/scheduler/ConfirmationAction.java > pso/T28L/chemical/webcomponents/src/java/com/webex/webapp/component/psochemical/scheduler/CheConfirmationAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/webcomponents/web/webcomponents/jsp/pso/psochemical/scheduler/che_std_layout.jsp base/T27L10NSP25/webcomponents/web/webcomponents/jsp/scheduler/std_layout.jsp base/T28L10NSP8/webcomponents/web/webcomponents/jsp/scheduler/std_layout.jsp > pso/T28L/chemical/webcomponents/web/webcomponents/jsp/pso/psochemical/scheduler/che_std_layout.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/webcomponents/web/webcomponents/jsp/pso/psochemical/scheduler/steps/che_std_step1.jsp base/T27L10NSP25/webcomponents/web/webcomponents/jsp/scheduler/steps/std_step1.jsp base/T28L10NSP8/webcomponents/web/webcomponents/jsp/scheduler/steps/std_step1.jsp > pso/T28L/chemical/webcomponents/web/webcomponents/jsp/pso/psochemical/scheduler/steps/che_std_step1.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/webcomponents/web/webcomponents/jsp/pso/psochemical/scheduler/che_scheduler.jsp base/T27L10NSP25/webcomponents/web/webcomponents/jsp/scheduler/scheduler.jsp base/T28L10NSP8/webcomponents/web/webcomponents/jsp/scheduler/scheduler.jsp > pso/T28L/chemical/webcomponents/web/webcomponents/jsp/pso/psochemical/scheduler/che_scheduler.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/webcomponents/web/webcomponents/html/pso/psochemical/js/che_scheduler.js base/T27L10NSP25/webcomponents/web/webcomponents/html/js/scheduler.js base/T28L10NSP8/webcomponents/web/webcomponents/html/js/scheduler.js > pso/T28L/chemical/webcomponents/web/webcomponents/html/pso/psochemical/js/che_scheduler.js
diff3 -m --strip-trailing-cr pso/T27LC/chemical/branding/src/java/com/webex/webapp/branding/psochemical/common/CheBrandingTools.java base/T27L10NSP25/branding/src/java/com/webex/webapp/branding/common/BrandingTools.java base/T28L10NSP8/branding/src/java/com/webex/webapp/branding/common/BrandingTools.java > pso/T28L/chemical/branding/src/java/com/webex/webapp/branding/psochemical/common/CheBrandingTools.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/branding/src/java/com/webex/webapp/branding/psochemical/common/taglib/CheFileList.java base/T27L10NSP25/branding/src/java/com/webex/webapp/branding/common/taglib/FileList.java base/T28L10NSP8/branding/src/java/com/webex/webapp/branding/common/taglib/FileList.java > pso/T28L/chemical/branding/src/java/com/webex/webapp/branding/psochemical/common/taglib/CheFileList.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/branding/src/java/com/webex/webapp/branding/psochemical/action/CheFileUploadAction.java base/T27L10NSP25/branding/src/java/com/webex/webapp/branding/action/FileUploadAction.java base/T28L10NSP8/branding/src/java/com/webex/webapp/branding/action/FileUploadAction.java > pso/T28L/chemical/branding/src/java/com/webex/webapp/branding/psochemical/action/CheFileUploadAction.java
diff3 -m --strip-trailing-cr pso/T27LC/chemical/branding/src/conf/psochemical/struts-config.xml base/T27L10NSP25/branding/web/WEB-INF/struts-config.xml base/T28L10NSP8/branding/web/WEB-INF/struts-config.xml > pso/T28L/chemical/branding/src/conf/psochemical/struts-config.xml
diff3 -m --strip-trailing-cr pso/T27LC/chemical/branding/web/branding/jsp/pso/psochemical/che_disclaimer.jsp base/T27L10NSP25/branding/web/branding/jsp/disclaimer.jsp base/T28L10NSP8/branding/web/branding/jsp/disclaimer.jsp > pso/T28L/chemical/branding/web/branding/jsp/pso/psochemical/che_disclaimer.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/branding/web/branding/jsp/pso/psochemical/che_myuploadfile.jsp base/T27L10NSP25/branding/web/branding/jsp/myuploadfile.jsp base/T28L10NSP8/branding/web/branding/jsp/myuploadfile.jsp > pso/T28L/chemical/branding/web/branding/jsp/pso/psochemical/che_myuploadfile.jsp
diff3 -m --strip-trailing-cr pso/T27LC/chemical/svccomponents/src/java/com/webex/webapp/svccomponents/psochemical/servicerecording/CheSendRecordingMailAction.java base/T27L10NSP25/svccomponents/src/java/com/webex/webapp/svccomponents/servicerecording/SendRecordingMailAction.java base/T28L10NSP8/svccomponents/src/java/com/webex/webapp/svccomponents/servicerecording/SendRecordingMailAction.java > pso/T28L/chemical/svccomponents/src/java/com/webex/webapp/svccomponents/psochemical/servicerecording/CheSendRecordingMailAction.java
#total match problems:1
